some cleanup
adding basic register