reverting props and fixing up logcat errors