Clearing up, updates a bit conf

Signed-off-by: Alex Lourie <djay.il@gmail.com>